core: Remove ot_clear_checksum() in favor of g_clear_pointer()

diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index ce860e5d90e545f23b81e258f0e245978667d977..96673f49c9d80db8fa2601abfab9d28ca3acf799 100644 (file)
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -563,7 +563,7 @@ ostree_checksum_file_from_input (GFileInfo        *file_info,
   ret = TRUE;
   ot_transfer_out_value (out_csum, &ret_csum);
  out:
-  ot_clear_checksum (&checksum);
+  g_clear_pointer (&checksum, (GDestroyNotify)g_checksum_free);
   return ret;
 }
 

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index e95b9dd60c8b386cf5d328f75d6212f64b3b825b..db24820eaa568ff31b91b1af7ef4d393413bfe0e 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -1056,7 +1056,7 @@ stage_object_internal (OstreeRepo         *self,
     (void) unlink (ot_gfile_get_path_cached (temp_file));
   if (raw_temp_file)
     (void) unlink (ot_gfile_get_path_cached (raw_temp_file));
-  ot_clear_checksum (&checksum);
+  g_clear_pointer (&checksum, (GDestroyNotify) g_checksum_free);
   return ret;
 }
 

diff --git a/src/libotutil/ot-gio-utils.c b/src/libotutil/ot-gio-utils.c
index 5e93157f0c8d446a4b19dc0eeb3e4dc9a41ee17a..b3df9a0c6502b0e088eea193c54f989847096bc4 100644 (file)
--- a/src/libotutil/ot-gio-utils.c
+++ b/src/libotutil/ot-gio-utils.c
@@ -336,7 +336,7 @@ ot_gio_splice_get_checksum (GOutputStream  *out,
   ret = TRUE;
   ot_transfer_out_value (out_csum, &ret_csum);
  out:
-  ot_clear_checksum (&checksum);
+  g_clear_pointer (&checksum, (GDestroyNotify) g_checksum_free);
   return ret;
 }
 

diff --git a/src/libotutil/otutil.h b/src/libotutil/otutil.h
index dfae5dc34560780d70e82fe6d6f868a5e92d0690..e6b2fb3f455bf20689b5d1c617f89aea27c30ab6 100644 (file)
--- a/src/libotutil/otutil.h
+++ b/src/libotutil/otutil.h
@@ -26,14 +26,6 @@
 #include <gio/gio.h>
 
 #define ot_gobject_refz(o) (o ? g_object_ref (o) : o)
-#define ot_clear_checksum(c) G_STMT_START {     \
-  typeof(c) __tmp_chksum = c;                   \
-  if (__tmp_chksum)                             \
-    {                                           \
-      g_checksum_free (*__tmp_chksum);          \
-      *__tmp_chksum = NULL;                     \
-    }                                           \
-  } G_STMT_END;
 
 #define ot_transfer_out_value(outp, srcp) G_STMT_START {   \
   if (outp)                                                \